merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 14 Oct 2010 07:21:40 +0000 (16:21 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 14 Oct 2010 07:21:40 +0000 (16:21 +0900)
commitec065a2f8cc1a2ab13691db23e3c91477da76a41
tree9a8e6d66b5fcc14e8fe4d947469260c77b2c6e2e
parentae0f9f4e60fd94aeb637f7e5b4a3c6759cf853b6
parent0cba9d8da2d5ec9a231b479bf5592a13b34c2f1a
merge trunk